Skip to content

Staging next#93465

Merged
vcunat merged 147 commits intomasterfrom
staging-next
Jul 25, 2020
Merged

Staging next#93465
vcunat merged 147 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Jul 19, 2020

Izorkin and others added 30 commits May 8, 2020 09:36
The python bindings were dropped in cryptsetup-2.1.0:
https://gitlab.com/cryptsetup/cryptsetup/-/blob/master/docs/v2.1.0-ReleaseNotes#L63

However this did not cause the blivet build to fail nor did anyone
notice (cryptsetup-2.1.0 was introduced in nixos-19.09).
This backport allows the Wayland documentation to be successfully
built.
Build the documentation by default, but install it to seperate outputs
so it doesn't have to be downloaded.  Documentation is still disabled
when cross-compiling, because that is currently broken:
wayland -> graphviz -> libdevil -> openexr -> ilmbase (broken)
@ofborg ofborg bot added 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 19, 2020
vcunat and others added 12 commits July 19, 2020 21:11
upstream doesn't do stable releases, but this seems to support python3 now
python-gyp: update with python3 support + drop python2 dependency in nss build
This merge actually doesn't seem to be a big rebuild:
     36 x86_64-darwin
    535 x86_64-linux
Due to a recent change in rustc 1.45.0, rustfmt now requires two
additional environment variables to be set in order to build
successfully: `CFG_RELEASE` and `CFG_RELEASE_CHANNEL`.
rustfmt: fix build with rustc 1.45.0
Some rebuilds, e.g. all of haskell.
Hydra nixpkgs: ?compare=1601713
@flokli
Copy link
Member

flokli commented Jul 22, 2020

Also cc @ajs124 on that. I did some digging, it seems we build libreoffice with the system-provided NSS, not the one shipped with libreoffice. I'm not sure if it's a good or bad thing.

@vcunat
Copy link
Member Author

vcunat commented Jul 22, 2020

It might be good for fixing security bugs, thought I don't know how important are use cases of nss in libreoffice.

@ajs124
Copy link
Member

ajs124 commented Jul 22, 2020

From what I gathered, Mozillians seem to recommend sticking with the "LTS" version of NSS for Firefox ESR, so we might as well use that for LibreOffice. Then again, support for Firefox 68 ESR will be dropped upstream soon enough (we probably shouldn't include it in 20.09), by which point 78 will be the new ESR, which requires NSS 3.53. Has anyone tried LibreOffice with that version? We skipped that because of the build system change, but 3.53.x should probably replace 3.44.x.

@vcunat
Copy link
Member Author

vcunat commented Jul 23, 2020

Yes, I did fix LibreOffice build in commit 34432ad by using NSS 3.44, just as with Firefox ESR and Thunderbird.

 * Fix regression on PS conversion.
   Regression only happened on applications that are locale enabled
   i.e. Okular but not pdftops, when using a quite new lcms and
   the user locale uses , as decimal separator instead of .
 * Add UTF16LE support to TextStringToUCS4.
   Even if the standard clearly says it should be UTF16BE
@vcunat vcunat merged commit 2b7c0dc into master Jul 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: vim Advanced text editor 8.has: clean-up This PR removes packages or removes other cruft 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.